Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 19:01:02 +0000 (11:01 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 19:01:02 +0000 (11:01 -0800)

Trivial merge